From ec5a98162354d88b7f5aed0f7966d49ee79e291a Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Mon, 27 Nov 2006 10:05:23 +0000 Subject: [PATCH] [HVM] Small fixes to mmio decoder/emulator. Remove a superfluous special case in xchg and fix word-size source operand movzx. Signed-off-by: Jan Beulich --- xen/arch/x86/hvm/platform.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/platform.c b/xen/arch/x86/hvm/platform.c index 10179c2864..3ed994ac1f 100644 --- a/xen/arch/x86/hvm/platform.c +++ b/xen/arch/x86/hvm/platform.c @@ -506,13 +506,16 @@ static int mmio_decode(int realmode, unsigned char *opcode, GET_OP_SIZE_FOR_NONEBYTE(*op_size); return reg_mem(*op_size, opcode, mmio_op, rex); - case 0x87: /* xchg {r/m16|r/m32}, {m/r16|m/r32} */ + case 0x86: /* xchg m8, r8 */ + mmio_op->instr = INSTR_XCHG; + *op_size = BYTE; + GET_OP_SIZE_FOR_BYTE(size_reg); + return reg_mem(size_reg, opcode, mmio_op, rex); + + case 0x87: /* xchg m16/32, r16/32 */ mmio_op->instr = INSTR_XCHG; GET_OP_SIZE_FOR_NONEBYTE(*op_size); - if ( ((*(opcode+1)) & 0xc7) == 5 ) - return reg_mem(*op_size, opcode, mmio_op, rex); - else - return mem_reg(*op_size, opcode, mmio_op, rex); + return reg_mem(*op_size, opcode, mmio_op, rex); case 0x88: /* mov r8, m8 */ mmio_op->instr = INSTR_MOV; @@ -655,14 +658,11 @@ static int mmio_decode(int realmode, unsigned char *opcode, mmio_op->operand[1] = mk_operand(*op_size, index, 0, REGISTER); return DECODE_success; - case 0xB7: /* movzx m16/m32, r32/r64 */ + case 0xB7: /* movzx m16, r32/r64 */ mmio_op->instr = INSTR_MOVZX; GET_OP_SIZE_FOR_NONEBYTE(*op_size); index = get_index(opcode + 1, rex); - if ( rex & 0x8 ) - mmio_op->operand[0] = mk_operand(LONG, 0, 0, MEMORY); - else - mmio_op->operand[0] = mk_operand(WORD, 0, 0, MEMORY); + mmio_op->operand[0] = mk_operand(WORD, 0, 0, MEMORY); mmio_op->operand[1] = mk_operand(*op_size, index, 0, REGISTER); return DECODE_success; -- 2.30.2